Merge "Fix unnecessary relaunches when unlocking with fingerprint sensor." into oc-dev