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

Change-Id: I10ee4c710e661823e31da71ad6699e55cbed1640