Merge "Ensure that animated key button drawable has callbacks" into rvc-dev