Ensure PushConnection is properly cleaned up on disconnect (#12226, #12522)

Change-Id: I0bab199632554655ef92a624f5654852b4b157d1