Merge changes from topics "cherrypick-lock-task-1l1m9ziktkw", "cherrypicker-L23700030000857114:N48700030014533099" into udc-qpr-dev

* changes:
  Disallow startAssist while lock task mode (kiosk) is active.
  Fix ScrollViewFunctionalTest running on Test thread