Merge "Revert "Show lock icon over hub"" into main