Merge "Fix Taskbar gone after predictive back to home" into main