Merge "Cell broadcast receiver should not be replaced" into rvc-dev