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

Change-Id: Ibb9f6bde96a436fdd328d746374c6c1bc4d66141