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

Change-Id: I8b449648c777d51010811ce3023c185c730ac60a