Merge "Permissions theme fixing" into mnc-dev