Feature add data grid loading state

DO NOT MERGE

END OF DAY COMMIT

#6153