Merge "Restart loader in onResume" into oc-dev