Merge "Fix cropping in docked stack." into oc-dev
am: 8658d43382

Change-Id: I2202a702f7d30c991399eccaa330ddfa650f5278