Merge "Correct null check for end button behavior."