Merge "Amend getOverlay() docs for SurfaceView/TextureView" into jb-mr2-dev