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

Change-Id: Id7e6c2485fa3a0519b77dd64498808d255f10fbc