Merge "Fix compatible property neverallows"