Merge "Store package restriction settings at shutdown"