Merge "Adding a button for expanding the clock screen challenge." into jb-mr1-lockscreen-dev