Merge "Ignore orientation of finishing activity" into main