Merge "Update GridLayout constructors to properly handle DEBUG=true"