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

Change-Id: I1165cf6e0766ef6038ddcc9febd44bac1d36865d