Merge "Add more log to track down the "idle until changed" issue." into oc-dev