Merge "Make RCS Message Store APIs ready to unhide"