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

Change-Id: I1432893fffc95498d4bcb085b04856b1293f51a2