Merge "Fix a bug where the wrong task was selected coming from home"