Merge "Modify javadoc for onWindowShown" am: 2d46e07e48
am: d5d1718c4a

Change-Id: I82c1c9a4601e579b34e6f8c40f80258b78a8a7d8