Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev