Merge "Status Bar - Wrap visible content in containers" into tm-qpr-dev