Fixed view not being displayed. Fixed view orientation change. (cherry picked from commit 6b2483c331)
6b2483c331