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