Merge "Renaming of a hidden API: ShowSoftInputOnFocus"