Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev