Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev