Merge "Handle runtime permissions" into mnc-dev