Merge "Potentially fix notification launch animation" into pi-dev