Merge "Fixing orientation change bug (5098088)"