Merge "OnActivated() change for Accessibility and KeyboardFocus" into devel/master