Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev