Merge "Merge "End button fade animation when its visiblity changes" into qt-dev am: ab662fe8a5" into qt-dev-plus-aosp