Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev