Merge "Include widget padding & boarder spacing in widget preview size estimation" into sc-dev