Merge "Add support for showing border for desktop tile" into tm-qpr-dev