Merge "some clean up of video size change notification" into lmp-dev