Merge "Use better heuristic for when to apply statusbar customization during predictive back" into main