Merge "Fix dst rect calculation"
am: 83c89bc149

Change-Id: I403dd6ffefd96700f69cf518bdb85c749b319ce4