Merge "Honor system insets in EditTextActivity" into main