full update from Anki-Android/master