Merge "Introduce DisplayWindowPolicyController for display across devices"