am 737552d7: Merge "Big refactor, additions to state transition animations"...
am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
* commit '737552d7':
Big refactor, additions to state transition animations