Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev