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

Change-Id: I8dbe77b963e0f6547c33ea1363c4c940eaf27fd8