Merge "Fix issue #5061083: Handler.removeCallbacksAndMessages..."