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

* commit '905766591d30f6dacc325d37a4d098a05a49f6e1':