Merge "Hide app icon during predictive back to home" into main