Various housekeeping and bug fixes
Merge pull request #989 from balabhv/vb548

Various housekeeping and bug fixes to the Android apps.