Merge "Fill in a stub parameter to startKeyguardExit" into main