Merge "Fix ANR & Crash on Ryu" into oc-dev