Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev