Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev
am: 76ec0575bc

Change-Id: If1353fcbfc97a752bec758763caf1188b8c0daa3