Merge "Reset the home settings activity when launching it" into tm-dev am: c741210bb1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17224594

Change-Id: Ib7bb1edac58ee58874f747cfeb100eb945b5627d