Issue #2987089 by askibinski, andypost, alexpott: Remove views.module's direct use of the _serviceId property (cherry picked from commit c7dc516f)
