Merge "QS: Fix detail flashing during transition." into lmp-dev