Merge "softening app-to-home and task-to-task transitions" into jb-dev