Merge "Change Easy Connect intent naming"