Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev