Merge "Move slide to unlock circle up" into klp-dev