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

Change-Id: I4937675c9088f53e1c6f82a55c6422f699f5ce36