Merge "Update display size before updating 'ignore orientation request'"