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

Change-Id: Iac6a4d72b56924d5e04358a60cc1173600e2a63f