Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev