This reverts commit 26ba26be. Reason for revert: breaks tv UX Bug: 110433804 Change-Id: I2c644ed62619f34494be0a0c7c75078cec0ebdd3