Merge "Player superclass for handling AppOps features" into nyc-dev