Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev