Merge "Fix testDefaultDisplayOverrideConfiguration failed."