Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev