Merge "Cleaned-up logic for determining clip rect for transitions animations." into mnc-dev