Merge "Update grid layout only on recView layout changes."