Merge "Update background crop animation threshold" into oc-dr1-dev
am: 79e11e4429

Change-Id: Ica3d6afccce4fce1ca1431b3bbb6e7a2b952771d