Merge "Run the ondrawn Keyguard callback in the bg thread" into main