Merge "Fix doc/build errors with PointerIconCompat"