Merge "Don't clear visible-behind activity if it is top" into lmp-dev