Merge "Change to use setupcompat and setupdesign for suw pages"