Merge "Support picture listener correctly in HW webviews"