Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev