Merge "Fix issue where notifications should not animate" into qt-dev
am: acd959e53f

Change-Id: I9c600866904b1508e18ca782d04558497ec6fa14