LPS-39185 Theme settings changes for an individual page are saved only for the second time