Merge "Fix decoder resolution change with tiles"