Merge "[PostBoot] Don't destroy loader because of config change, not just because of theme change" into main