Merge "Remove obsolete code for monitoring USB status"