Merge "Made sure to unlock the pending unlock if the user is being switched" into qt-r1-dev am: 3eec3dcd05
am: 9deab66d2a

Change-Id: Icbfb50d6bf670bf943830932636fdd7419cc6d72