Merge "Check only the display where the app layer is supposed to be, not all visible displays" into main