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

Change-Id: I23deb9056dbd9967bfe07d3db30256794b30a778