However, what I think is a much better solution is to be able to control Lock with master password separately from the Lock with PIN, as they serve different purposes.
i.e. Lock with PIN on browser restart, and lock with master password on system lock.