Merge "Do not show UI when currentID changed." into oc-dev