Bug Report Android 3.24.0

General improvements on security & edge case scenarios