Merge "Remove Dev Settings app from emulator images" into nyc-dev