Remove (X) next to Alerts/Messages if there is one section

Change-Id: Ibf66328e31bfefb3d588196c3f4babfa65bb52f3
Eg: Alerts(X) becomes Alerts
Merge "Remove (X) next to Alerts/Messages if there is one section"