Merge "Fix lock icon missing on hub" into main