Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev