More CraveStatusBar changes

Change-Id: Ia3f1e7a987c7abcc3a11bd45b679f78db1598579