Merge "Fix DisplayPolicyLayoutTests"