Merge "Rebase system theme on configuration change"