Merge "Disabling the activate button when paused" into oc-dev am: dacdcb9b42
am: 04c93c6628

Change-Id: Idad6231a35a90b401651effd59123a647985336f