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

Change-Id: I2cb81342813f3ea402044e9c067a066d76873f94