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

* commit '382d8606869c777fedc570494dfe6a698e5a1edd':