Merge "Do not enable task bar / nav bar unification on phones even when enableTaskbarNavbarUnification() is true" into main