Merge "Store package restriction settings at shutdown" into pi-dev