Merge "Smartspace padding for AOD/LS" into sc-dev