Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page"