Merge "insistent heads up should not time out"