Merge "Add multi-display support to FloatingToolbar." into oc-mr1-dev
am: 01b6ff0178

Change-Id: Ic3c317435ba408522b2b26f74c4df5a772871566