Merge "Status Bar - Fix privacy dot being in the wrong corner after fold/unfold" into main