Resolve conflicts for 1.2.0 (CATcher-org#329)

Co-authored-by: Gabriel Goh <[email protected]>
Co-authored-by: Arif Khalid <[email protected]>
Co-authored-by: NereusWB922 <[email protected]>
Co-authored-by: AdityaMisra <[email protected]>
Co-authored-by: Misra Aditya <[email protected]>
Co-authored-by: Vignesh Sankar Iyer <[email protected]>