Merge "Add a time margin for deferred enable." into jb-mr2-dev