am 8afc8e2e: (-s ours) DO NOT MERGE - Refactor preview position logic

* commit '8afc8e2eaaa4fdeef3cf9060cc69613d37804f56':
  DO NOT MERGE - Refactor preview position logic