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

Change-Id: I29cea04f2a2401ee8aa50794db3612216e50a29c