Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev am: 95820eb001
am: 39f1a86a3a

Change-Id: I54554d6fa2f643eda21f3be4fb56864e2f1d1f0a