Merge "Force vrhwc/wm to report the native resolution"