Merge "Remove native pixmap matching rule since it can't be queried." into nyc-dev