Merge "Rename COMMAND_LOCKSCREEN_TAP and refactor parameters of onLockscreenFocalAreaTap" into main