Merge "Re-apply Day/Night to all Activities" into mnc-ub-dev