am 36f82a32: Merge "Fix screen issues with externally added items" into ub-now-porkchop

* commit '36f82a32a644e3c06e16283d33b9a74cac1935d8':
  Fix screen issues with externally added items