Merge "Add limits to App Usage Observer Api" into pi-dev