Merge "Prettify the captive portal sign-in activity" am: 5dbdffbf81
am: 6e145ffb0e

Change-Id: I183a1c4e9b38b88c541eb3acf3412eb29744bd69