Merge "Fixed DisplayPolicyLayoutTests fails"