Merge "Make captive portal login app not restart upon device rotation." into nyc-dev