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

* commit 'fa5fa8f8a0a591eaae0cc8aaa18acae5433b9f0e':
  Always update drawable container source res