Merge "Unable to select twilight scheduling after enabling location" into rvc-dev