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

Change-Id: Ib89d68724cc8d1c57304f3cae257b96e6b73dbbc