Merge "Replace to correct footer preference style" into sc-dev