Merge "Refresh permissions UI on fragment resume" into mnc-dev