Merge "Remove wifi and celluar tiles from qs" into tm-qpr-dev