Merge "[PostBoot] Do not destroy post boot loader because of theme change" into main