Merge "Add hidden API to check support of Multi-Display" into oc-dev