Merge "Add temporary layer alpha fallback to OpReorderer"