And merge a single z-index property into the main css. Change-Id: I0a8ed76c98b46052b2cf4b32cfcae498c1615584 (cherry picked from commit 7ba1f6a12c6c8797b3d832faf540d4914b6f219b)
(cherry picked from commit 01c828c911fa70b263fee699efbc656fde54d03f) Change-Id: Idc215e67b21b1f0ba48b3d391041278dd6526cfe