Merge "Adding more checks around unlocking the phone" into ub-launcher3-master