Merge "Fix TwilightManager Location Permission handling" into mnc-ub-dev