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

Change-Id: I7dd3de25fe1f1bd681cdfefd33bc9b134937827d