Merge "UX fixes for QR code scanner QS tile" into tm-qpr-dev