Merge "Fix touch on QQS tiles" into tm-dev