Merge "Fix horizontal and vertical padding for options" into sc-dev