Merge "Fix predictive back to home with pinned taskbar" into main