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

* commit '0346331767335c3c8a658bf6f2fdf0b005904a89':