Merge "Note that user engagement replenishes EJ quota." into sc-dev