Merge "Fix black screen when launching app from Recents into non-docked area"