Merge "Improve All Set page UI for large screens" into tm-qpr-dev