Merge "Move bounds adjustment logic to LaunchParamsUtil" into tm-qpr-dev