Merge "Emulate Zen rule policy inheritance until edit UI is available" into main