Merge "Fix missing status bar icons" into lmp-dev