Merge "Add @TransitionRes for transition resource integers"