Merge "Set lock state and reason upon request"