Merge "Remove assist status stuff from StatusBar." into qt-dev
am: a3e45d5d26

Change-Id: I1d2c0472bdae7d9b5d188887bedf03cba4938876