Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a291336bd8  -s ours
am: a0b75ff516

Change-Id: I56296cc7b7c2febd049b0a02865735ad7868bda6