am 058df7d0: (-s ours) Merge "Fix bug #15173703 Crash in Settings is observed...
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 '058df7d0':
Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE