Merge commit '7c64a89b3c6d05e03bc72df18fbcf34365833b37' * commit '7c64a89b3c6d05e03bc72df18fbcf34365833b37': Attempt to fix [2152536] ANR in browser
Merge commit '7c64a89b3c6d05e03bc72df18fbcf34365833b37' * commit '7c64a89b3c6d05e03bc72df18fbcf34365833b37': Attempt to fix [2152536] ANR in browser