Merge "Several fixes for AdapterTransition." into klp-docs