Merge "Add Aware Lock Settings" into qt-dev