Merge "Support maximum wait time for Cell broadcast" into qt-qpr1-dev