Merge "Fix bootloops in TwilightService" into nyc-dev