Merge "Adds unit tests for ShortcutChangeCallback APIs" into rvc-dev