Merge "Check if google authenticator is on device for no account prompt" into ics-mr1