Merge "Make EditTextActivity respect ime insets" into main