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

* commit '2db95a607434908c25796e44946e92ee59548ce6':