Merge "Fix missing transport in keyguard" into klp-dev