Merge "Add NO_ORIENTATION_PREFERENCE type to unset the preferred orientation" into...