Merge "Zen automatic rule page ui changes"