Merge "Add hotspot icon to status bar" into lmp-mr1-dev