Merge "Fix wrong UID in app op toggle" into mnc-dev