Merge "Start client only if requested when ensuring activity visibility" into main