Merge "Add permission to modify user preferred display mode."