am 058df7d0: (-s ours) Merge "Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE" into lmp-preview-dev

* commit '058df7d01fa592b8b0068db9a7770a7eaf3f46f0':
  Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE