Merge "Fixed issue with prematurely removing display for child activities."