Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev