Merge "Fix PG Showing Duplicate SMS" into cm-11.0