Merge "Reduce potential latency of popping up destination dialog" into sc-v2-dev