Merge "Fix RTL EdgeEffect in QC" into lmp-dev