Merge pull request #3616 from oneplusme/crunchyroll-login