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