Merge remote-tracking branch 'origin/top-secret' into top-secret

# Conflicts:
#	.gradle/7.5/executionHistory/executionHistory.bin
#	.gradle/7.5/executionHistory/executionHistory.lock
#	.gradle/7.5/fileHashes/fileHashes.bin
#	.gradle/7.5/fileHashes/fileHashes.lock
#	.gradle/7.5/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	app/src/main/java/com/example/game2d/CharacterActivity.java