Merge "Don't even try to verify the native resolution validity a" into jb-mr2-dev