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

Change-Id: I6fada8610ecbce5dc31683e7a3a0f4072a3e6ced