[R43] Upgrade patches. Fix multitheme patch bug