Merge "Lockscreen: check for 600dp device to hide minimize challenge option" into jb-mr1