Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0