Merge "Allow restarting foreground services once" into nyc-mr1-dev