Changes:
 - Android 12 specific bug fixes