Merge "Support ignoring app orientation request per display"