Fix screen orientation change reset issue