Merge "use FgThread.class instead of UiThread.class for lock object"