Merge "Update DecorContext's Resource cache when calling getResources." into pi-dev am: 33cb3b7204
am: a4a5070d2f

Change-Id: I1c9dc4fd0ea55ffdb33fd0d0190cb1fae9964dce