Merge commit '9dfc244ae4b1b9994fab20659aa29455240b3272' * commit '9dfc244ae4b1b9994fab20659aa29455240b3272': Add option to allow no-unlock-on-slider-open