Merge "Add high power whitelist for apps" into mnc-dev