Merge "Add support for user-selectable night mode"