Merge "Don't animate status icons when the container changes size" into qt-dev
am: 58517b7bfa

Change-Id: I226c87374adda68ccf3572d070cfe72a26b98978