Merge "Update app grid options after changing grid" into tm-qpr-dev