Merge "Add the automatic handling of night/notnight UI modes."