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

Change-Id: I74ce65bc67ad8896c1c1b8260325aec1030c1128