Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev am: 7c4998e614
am: 656d33f323

Change-Id: I1a31b55aaf5844241d926839c163f2a550f8a1e5