Merge "Correcting mNightMode which should set from Configuration" into sc-v2-dev