Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a3 am: 45562df8bb
am: b95e567919

Change-Id: I2916de2a4c09849e12bff2dea5a4cd34c080b2f9