Merge "New UI to hint user about strong auth" into nyc-dev