Merge "Remove screenshot animated view"