Merge "Ensure the next activity of non-focusable task to be visible"