Merge "Modify javadoc for onWindowShown"
am: 2d46e07e48

Change-Id: I126b0bcfbc5d1d10cad7564e7f8c8a7e419b96c6