Merge "Status bar iconography updates" into lmp-dev