Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev