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

Change-Id: I35d6b6b8dfb064b7fd7ae1d8ee24fce4aebd5d27