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