Merge "Parameterize some keyguard tests for scene container flag" into main