Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev