[DF-4648] Fix by review comments, Fix update screen position