This pull request contains fixes for issue 335.
Tested on Samsung Note5 (Android 7.1) and Samsung S20 (Android 10.0) devices.
This pull request contains fixes for issue 325.