Merge "Make task visible if activity launched behind"