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

Change-Id: Idf59721fe1a332e14d004b5129a12c692fe1868e