chore(android): Merge remote-tracking branch 'origin/master' into fix/android/keyboard-picker-activity