Merge "Put MSG_REPORT_TEMP_APP_WHITELIST_CHANGED_TO_NPMS back."