Merge "Fix lockscreen notification launch animation" into pi-dev
am: a1d6bd94fe

Change-Id: I12cbc8fbd9b087d882eebc8a1b2052e6988128c9