Merge "Fix scroll controller initialization." into lmp-mr1-dev