Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev