Merge "Fix grid layout defaults" into devel/master