Merge "Fix clock/smartspace horizontal padding for Felix/Tangor portrait" into main