Merge "Remove float from config-settings-block"