Merge "Disallow startAssist while lock task mode (kiosk) is active." into main