[automerger skipped] Merge "Fix crash in clicking Default Home gear icon." am: 0c724f5181
am: 51a72d4c38
am: 323e54ddf5
-s ours
Change-Id: Ia039b43a5e4301e0b7451181ef4be95e18bd847d
This commit is contained in: