Merge "Do not animate padlock when fp" into rvc-d1-dev