Merge "Add grid manager demo to Support7Demo app" into lmp-dev