Merge "Swap the order of disabling data roaming button" into oc-mr1-dev