Merge "msm: clock-local2: Move display clock support"