Merge branch 'MDL-68983-recent-session-lock-ro' of https://github.com/brendanheywood...