Merge "Fix fade in duration." into lmp-mr1-ub-dev