Fixed duplicate key issue#3452

tamaskozmer merged 3 commits intorelease/student-8.4.2-285instructure/canvas-android:release/student-8.4.2-285from

fix-potential-todo-crashinstructure/canvas-android:fix-potential-todo-crashCopy head branch name to clipboard