Merge "Reset activity's "return to home" flag on relaunch" into klp-dev