Merge "Do not register Taskbar System Action when device is in phone mode" into main