Merge "Don't animate status icons when the container changes size" into qt-dev...
Merge "Don't animate status icons when the container changes size" into qt-dev am: 58517b7b am: a113a508
am: c74b8612
Change-Id: I186a5929c776b63efef8aac570d85a968c985408