Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev