Merge "Remove setMaximumTimeToLock Test" into jb-dev