Merge "Fix tinting issue in manage permissions" into mnc-dev