Merge "Wait for scrim animation before showing lock icon" into qt-dev