Merge "QS: Back button closes detail (if showing)" into lmp-dev