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

Change-Id: I759aa487aa85d35322c7e1be5cc10e46ce5c5b7d