Merge "Restart or finish HomepageActivity when it's launched unexpectedly" into main