Merge "[ANativeWindow] Apply remaining API feedback"