* commit 'b4eb06402fba62f94bb16cbe433fe99a8df7cb18': Avoid use-after-free race condition when rebasing theme