Merge "Add dependency on android-support-transition"