Merge "Init the pref summary in onCreate()" into oc-mr1-dev