Merge "Change notification alert icon" into qt-dev
am: 2821456995

Change-Id: I7b38e88e702ce91162f29592c69dcc4f8612181d