Merge "Replace footer with regular preference"