Merge "Delete Falsing for long tap flag" into udc-dev