Merge "fixed applyConfigurationToResourcesLocked WeakReference is null"
am: 264d1f12a3

Change-Id: Icfaf039b078d7ce43b23bed09cd0102427c6f047