Merge "[TP] App grid support for reset (3/4)." into tm-qpr-dev