[ros-diffs] [zguo] 65126: [BOOTDATA] Merge theme switching fix. CORE-8718