Merge "Revert "Enable content observer notifications even for default SMS app, when the""