Merge "Add a fixed viewport margin since website content width changes."