Merge "Impose a height & width downward on challenge views." into jb-mr1-lockscreen-dev