Merge "Fix NPE crash in footer preference" into main