Merge "Extend assist context to foreground services"