Merge "Always allow System user to change device config in case of Multi-user-multi-display (MUMD)" into main