am db04b945: am 03463317: am 2db95a60: am 4a0eda76: Merge "Updating the UI for focused state of an icon/folder." into ub-now-porkchop

* commit 'db04b94518d59c2a7975fedae75c1d41009d2b22':