Merge "ApiDemos: Add maxAspectRatio demo" into pi-dev