Merge master to settings-layout.