Merge "New strings for "Automatically lock"" into qt-r1-dev