Merge "Always update drawable container source res" into nyc-dev