Switch the order of Alerts and Messages tabs

Change-Id: I864d45336c23331543ff6aaea8ec6512d4fba0c3
Merge "Switch the order of Alerts and Messages tabs"