Merge "Remove lock of getLockTaskModeState"