Merge "LockIcon fixes" into qt-r1-dev