Rename/reorder patches to avoid duplicate usage of 300-* prefix. No functional changes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>