Merge "Do not show removed permissions in the UI - framework" into mnc-dev