Merge changes Id7ae3838,I8e297443

* changes:
  Fix NPE when shared elements are empty.
  Allow antroid.transition Transitions in fragments.