Merge "Implement DisplayWindowPolicyController"