Merge "Fix setApplicationNightMode did not persist night mode." into sc-dev