Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev