Merge "Revert "Don't allow 0-sized views to be focused.""