Revert "Merge pull request #24561 from gmarty/Bug-1074028-Overlapping-rocketbar-statusbar-icons-3rd-party-apps"

This reverts commit db4125ff56efbe3e8951a6e41c1e53a47a46aa5b, reversing
changes made to a23d2c490b39c4699c9375e25c4acdf396a2fa85.