Merge "Fix crash in clicking Default Home gear icon."
am: 0c724f5181

Change-Id: I53b6c18077d0bcf5a7bc13fcc425c6c1ca4143ad