Merge "Revert "Status Bar - Wrap visible content in containers""