Merge "Add getRawWidth() and getRawHeight()"