Merge "Fix onStateChanged issue."