Merge "Clear binder identity before reaching into keyguard settings"