Merge "Fix back arrow on additional permissions" into mnc-dev