Merge "Revert "Fixed portrait orientation if fixed_rotation flag""