Merge "Fix 5149726: Add slight delay to initial lock screen 'ping' animation."