Merge "Add split perms from W_E_S to media" into tm-dev