Merge "Improve items arrangement in the app switcher popup" into tm-qpr-dev