Merge "Ignore ui mode change caused by Morris overlay in PiP" into sc-v2-dev