Optimized button handling after answer is sent. Task #11573 & Task
#13960