Merge "Add Aware Lock Settings" into qt-dev am: a491cc4cd0
am: f2692ee338

Change-Id: I5b9237eeab6740407482c79d1039bab50a63c826