Revert "Remove lousy synchronization"

This reverts commit a3420c7f707b07e33bdb9f5aba65f3b8f9d72911.

Reason for revert: causes text density inflation issue
Bug: 131914931

Change-Id: Ic63ba977dba9df6e327b18e51661d4eea6105d53
2 files changed