Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev