This reverts commit ae8b96964c. Reason for revert: causes overlay elements to not appear. Test: manual Bug: 222307681 Change-Id: I2d1f55227774a39f4b2dbe927ddd3aa1a5178351
ae8b96964c
e96070ac89
114d0c7773
1bb2f28548