am 91977396: Merge "Fix bug to render status bar icons" into lmp-preview-dev

* commit '9197739603eb34df6cbc85c6a7fa0ea359e4776b':
  Fix bug to render status bar icons