Merge "FloatingToolbar: Rules for ordering menu items." into oc-dev am: 6d149bc953
am: ab95d6c9de

Change-Id: I105f471b60bf06775f80e5f9ac3ec9b4b78632dd