Merge "Verify onNewIntent lifecycle" into pi-dev