No, This was not the Indian Firmware which i was talking but thanks for letting me know the newest firmware. I will download and try the same.
Also i am thinking of changing the phone, so which should be the next one - I am confused in these phones (Moto G4 Plus / One Plus 3 / Samsung A9 Pro).