Merge "Lock screen string change" into qt-r1-dev