Merge "Added a settings for CMAS message broadcast"