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

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

Change-Id: I0065aa4a731ba43c29cd4719f685d9e09b853279