Merge "QS: Don't collapse the panel when turning location on." into lmp-dev