Merge "Swap in right icon for messaging and info." into mnc-dev
tree: 4e34dbc8a876d0f8cc5e619c74d5de1aef9072d5
  1. src/
  2. TestCommon/
  3. tests/