Merge "Show lock icon over hub" into main