Merged Android Fixes

Thanks Matt
Fix iOS button text

Leading space escaped