Merge "Merge "some case layout display anomalies" into oreo-mr1-cts-dev am: 287330bf4d"