Merge "Merge "Pad ime_switcher same as navbar buttons" am: c5d8c9b1 am: 6b98b93a am: 0f81e48f" into rvc-d1-dev-plus-aosp