Merge "Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours am: aedf7cdfdb  -s ours am: f52c8ccbfc  -s ours" into oc-dr1-dev-plus-aosp