Merge "Add UI_NIGHT_MODE_CUSTOM_TYPE to SecureSettings backup." into tm-dev