Merge "Make sure mCurrentUsbFunctionsRequested flag be updated currectly"