Merge "Merge "Consolidate start new input scenerios" into rvc-dev am: 6c440de7a4 am: 96863d0d50 am: 3caa59be1d" into rvc-qpr-dev-plus-aosp