Merge "Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev am: c07c23b1f7  -s ours am: 1255f26551 am: 83ee844603 am: f8554c0752"