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