Merge "Don't refresh UI if it's not visible"