added android:configChanges
removed commented code
added layout orientation change
Merge branch 'video-orientation' into develop