Merge "Go home before starting AwareActivity." into pi-dev