Merge "PIN view - Tweak animation" into sc-dev