Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am: 564d0bf1be
am: 98b181b25f

Change-Id: Ic87422062ac28fb51596af2a7665b228b446b98a