Merge "Fixed that silent notifications weren't showing on AOD" into qt-r1-dev am: 2738aa3f79
am: 0ff5987326

Change-Id: I917ede5dfee40333c39ebf046714f03d0cfac0eb