Merge "Restart P2P_SMS inactivity timer when device receives SMS" into main