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

* commit '55bd525f309fc5d9f77373358ff4fbcd9a092ffb':