Merge "Revert "Fix bubble bar location on device boot."" into main