Merge "Fix screenshot to corner animation" into sc-dev