This reverts commit e0046cec. Reason for revert: Regresses UI theme Bug: 62445682 Bug: 36561125 Change-Id: I9b60bd8e4eb89129368d38e83c0036ab459a524e