Merge changes I5d575dcd,Ib277941d

* changes:
  Tidy PhoneStatusBarView
  Remove StatusBar#getStatusBarView