Merge "Always check front stack on its current display"