Merge "Show back button when launcher is disconnected from proxy service" into pi-dev