Merge "Modify javadoc for onWindowShown"