Sorry, I don't use masking or locking so I haven't encountered your issue. As long as I'm here though, I'll throw in a vote for your request.
