Merge "Improve isInForeground"