Merge "Revert^2 Fix missing animation when launch activity from notification" into rvc-dev am: e7f5bd073e am: 3a2c2aa37a

Change-Id: Ie01940160b072e69b2ab16815b14b118223aba82