Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev