Code cleanup/ Move OnLayoutChangedListener to class level.
am: 5215b545b9

Change-Id: I0b7c2154029e3c1dd1ec0c0ae64d484cf4f84b3e