Merge "[pm/incremental] handle package setting nullptr"