Merge "Use app id instead of uid to check if appop is bypassed" into main