Merge "Don't whitelist all system image apps." into pi-dev