Merge "End button fade animation when its visiblity changes" into qt-dev