Merge "Wait for relaunching activity to finish sync" into udc-dev