Merge "Cleaned up status bar closing handling" into lmp-mr1-dev