Merge "Fade back button in and out tied with the overview/shelf (1/2)" into pi-dev
am: d51bbc5fe4

Change-Id: I42eb98160f653d6d2fd7f87b9657ea74fd9bc384