Merge "Don't send RTT upgrade request if already RTT" into pi-dev