Merge "msm: Fix ciruclar dependency in debug UART settings" into msm-3.0