Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1