Merge "Ignores AppOps entries belonging to other users" into klp-dev