Merge "Disabling the activate button when paused" into oc-dev