Merge "Revert "Finish HomepageActivity when it's not the root of a task and not singleTask."" into main