Merge "Fix dst rect calculation" am: 83c89bc149 am: 3912c53090
am: fffecbfcd0

Change-Id: I254795d27f0caa80922166d00eae23ad5a9b70cf