Merge "[Notif] Safeguard animation start" into pi-dev am: 97d17a7774
am: d4853c3206

Change-Id: Ie21a33df63c9cbcaa28545b98ff14ac1fe8075ab