Merge "FP2-1515: Fixed Dual Sim SMS Delivery Reports bug" into fp2-dev-v2