Merge "Remove display VR brightness clients"