Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev am: 3df43a3eae
am: 4dfe356797

Change-Id: Id0fe0d8c491a76bed3108c59acf3bb7d7179101c