Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev