Merge "Bug 3135 - Fixed support for InterestListener" into stable/lithium