Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
am: 479d915db5

Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b