Merge "Move all UI thread callbacks off ui thread to mitigate watchdog kills"