Merge "Find a background to animate when launching a dialog or activity" into tm-dev