Merge "msm: rtb: Separate initialization from enablement" into msm-3.0