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

Change-Id: Icc29bc1c5cd0786d03070475564c640e4db68e50