Merge "Fix SysUI crash when locking while showing the Media Output Group dialog" into sc-v2-dev