Merge "Improve docked & freeform task to front app transition."