Merge "Remove removeCallbacks when processing tiles" into udc-dev