Merge "Fix menu visibility while updating dismiss fraction." into oc-dev