Merge "Introduce @SoftInputModeFlags annotation"