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

Change-Id: I441a7b99dd3131467cb632723e8179464090edf8