Merge "Suppress Layout during Visibility transitions" into mnc-dev