Merge "Make drawing of layouts in navigation editor avoid using huge images" into studio-1.3-dev automerge: fd02afe
automerge: bf2dadd

* commit 'bf2dadd9ed6b79031aa06cd9fc52fa8ea1bbffbe':
  Make drawing of layouts in navigation editor avoid using huge images