Merge "Add multi-display support to FloatingToolbar." into oc-mr1-dev