Merge "Check for lock icon nullability" into qt-dev