Merge "Refactor device padding to be set per grid option" into sc-dev