Fix Themes FC and reboots

Change-Id: Ia20a139cdaa4900661328bafa550fee04fe1c4b8