Merge "Remove ContextImpl.mOverrideConfiguration to reduce code confusion."