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

Change-Id: I80fac516afe2c7b75fe775d80444a501585bd3b7