Merge "Refactoring the focus state to be independent of view focus."