Merge "Do not crash test on invalid pending intent" into main