Fix some GA issues.
Fix some GA issues.

vector-im/vector-android,vector-im/vector-android,vector-im/vector-android,riot-spanish/riot-android,floviolleau/vector-android,riot-spanish/riot-android,noepitome/neon-android,riot-spanish/riot-android,noepitome/neon-android,floviolleau/vector-android,floviolleau/vector-android,vector-im/riot-android,riot-spanish/riot-android,vector-im/riot-android,vector-im/riot-android,vector-im/riot-android,noepitome/neon-android,noepitome/neon-android,vector-im/riot-android,vector-im/vector-android