am 7d88429c: am 22308ce1: Merge "Updating the icon click feedback" into ub-now-porkchop

* commit '7d88429c81d64ae4e5bb0314c47d4641998d7aee':