Merge "Only run KeySyncTask after a successful screen unlock"