am d939dd2e: Merge "Fix race condition in status bar init code." into ics-mr1

* commit 'd939dd2eaacbe898dc82170a4b41a7248fe182e6':
  Fix race condition in status bar init code.