Merge "Fix stuck wallpaper with predictive back" into main