Merge "Take into account scroll offset for transition animation" into mnc-dev