Merge "Do not reset per package appop modes for permissions"