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

Change-Id: I861c5f7d4527d297e8049fbd6fddb3a5f96248fc