Merge "Rename permission controller styles"