Merge "Fix robotests fail if turning on silky home by default" into sc-dev