aosp-stable: Fixed an ANR bug