Merge "Permission UI - legacy apps support" into mnc-dev