Merge "Limit item count in QS detail" into lmp-mr1-dev