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

* commit '2a857c633ddf2cdb02c768f9340ecb5abe468c48':
  Work on issue #17624121: Settings crash while launching on wiped device