Merge "Not allowing foreground services to be cleared as children" into nyc-mr2-dev