Merge "Update Night display icon in Settings" into oc-dr1-dev