Did you ever find a better solution for this that matches the UIKit animation?