Merge "Fixed portrait orientation if fixed_rotation flag"