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

Change-Id: I626ad04ac8ef942c266b2e964ae141221935396b