Merge "Fix issue with stack not invalidating when only focus state changes."