Merge "Force to unlock work challenge before reply inline notification" into nyc-dev