am cf6e0d68: Merge "Add display synchronously." into klp-modular-dev

* commit 'cf6e0d686f42036992bdac4f47d37bc8c0775027':
  Add display synchronously.