Merge "Fix NPE in pm reset-permissions." into main